feat: Scoped clusters #7039
Merged
feat: Scoped clusters #7039
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: pashavictorovich <[email protected]>
Signed-off-by: Victor Plakyda <[email protected]> Signed-off-by: pashavictorovich <[email protected]>
Signed-off-by: Victor Plakyda <[email protected]> Signed-off-by: pashavictorovich <[email protected]>
Signed-off-by: Victor Plakyda <[email protected]> Signed-off-by: pashavictorovich <[email protected]>
Signed-off-by: Victor Plakyda <[email protected]> Signed-off-by: pashavictorovich <[email protected]>
# Conflicts: # ui/src/app/applications/components/application-retry-options/application-retry-options.tsx # ui/src/app/applications/components/applications-sync-panel/applications-sync-panel.tsx # ui/src/app/shared/models.ts
Signed-off-by: pashavictorovich <[email protected]>
Signed-off-by: pashavictorovich <[email protected]>
Signed-off-by: pashavictorovich <[email protected]>
Signed-off-by: pashavictorovich <[email protected]>
Signed-off-by: pashavictorovich <[email protected]>
Signed-off-by: pashavictorovich <[email protected]>
Signed-off-by: pashavictorovich <[email protected]>
Signed-off-by: pashavictorovich <[email protected]>
Signed-off-by: pashavictorovich <[email protected]>
Signed-off-by: pashavictorovich <[email protected]>
Signed-off-by: pashavictorovich <[email protected]>
…efresh/argo-cd into scoped-clusters
Signed-off-by: pashavictorovich <[email protected]>
Signed-off-by: pashavictorovich <[email protected]>
Signed-off-by: pashavictorovich <[email protected]>
Signed-off-by: pashavictorovich <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #7039 +/- ##
=======================================
Coverage 41.07% 41.07%
=======================================
Files 158 158
Lines 21305 21341 +36
=======================================
+ Hits 8750 8766 +16
- Misses 11303 11313 +10
- Partials 1252 1262 +10
Continue to review full report at Codecov.
|
alexmt
requested changes
Aug 24, 2021
util/argo/argo.go
Outdated
| @@ -421,6 +435,10 @@ func GetAppProjectByName(name string, projLister applicationsv1.AppProjectLister | |||
| for _, repo := range repos { | |||
| project.Spec.SourceRepos = append(project.Spec.SourceRepos, repo.Repo) | |||
| } | |||
| clusters := retrieveScopedClusters(name, db, ctx) | |||
| for _, cluster := range clusters { | |||
| project.Spec.Destinations = append(project.Spec.Destinations, argoappv1.ApplicationDestination{Server: cluster.Server, Namespace: "*"}) | |||
There was a problem hiding this comment.
Cluster might be connected in a "namespaced" mode - cluster.Namespaces is not empty. In this case only these namespaces should be auto-added to the destination. E.g.
if len(cluster.Namespaces) == 0 {
project.Spec.Destinations = append(project.Spec.Destinations, argoappv1.ApplicationDestination{Server: cluster.Server, Namespace: "*"})
} else {
for _, ns := range cluster.Namespaces {
project.Spec.Destinations = append(project.Spec.Destinations, argoappv1.ApplicationDestination{Server: cluster.Server, Namespace: ns})
}
}
alexmt
reviewed
Aug 24, 2021
There was a problem hiding this comment.
Thank you @pasha-codefresh ! Found only one minor issue and it is ready to go
Signed-off-by: pashavictorovich <[email protected]>
|
Sorry, is there a PR description or an issue I could read up ? :( |
|
hello @sbose78 . Sure, here it is: #5283. We also discussed implementation in the proposal: https://github.com/argoproj/argo-cd/blob/master/docs/proposals/project-repos-and-clusters.md |
plakyda-codefresh
pushed a commit
to plakyda-codefresh/argo-cd
that referenced
this pull request
Sep 28, 2021
feat: Scoped clusters (argoproj#7039) Signed-off-by: pashavictorovich <[email protected]> Signed-off-by: viktorplakida <[email protected]>
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note on DCO:
If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.
Checklist: